From 331db35d571c43e48e8165918f3b27b34bce58c7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 27 Apr 2015 19:20:29 -0400 Subject: [PATCH] GtkLabel: Prefix more ui parser errors This may become useful in gnome-builder for highlighting errors, so do it consistently. --- gtk/gtklabel.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index e51300379e..def986faeb 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -1598,17 +1598,19 @@ pango_start_element (GMarkupParseContext *context, } attr = attribute_from_text (data->builder, name, value, error); - - if (attr) + if (!attr) { - attr->start_index = start_val; - attr->end_index = end_val; + _gtk_builder_prefix_error (data->builder, context, error); + return; + } - if (!data->attrs) - data->attrs = pango_attr_list_new (); + attr->start_index = start_val; + attr->end_index = end_val; - pango_attr_list_insert (data->attrs, attr); - } + if (!data->attrs) + data->attrs = pango_attr_list_new (); + + pango_attr_list_insert (data->attrs, attr); } else if (strcmp (element_name, "attributes") == 0) { -- 2.30.2